From: robertl Date: Sun, 20 Jun 2010 04:16:20 +0000 (+0000) Subject: Run through release process. Minor fixes to build process. X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~17^2~1 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=a319e5db283dd3d489a807e14c067f2cb4b132ca;p=gpsbabel.git Run through release process. Minor fixes to build process. --- diff --git a/Makefile.in b/Makefile.in index 53c9eec2d..8295998ec 100644 --- a/Makefile.in +++ b/Makefile.in @@ -348,23 +348,23 @@ mac-release: mac-gui: gpsbabel file gpsbabel | grep '2 architectures' || exit 1 - file gui/objects/gpsbabelfe-bin.app/Contents/MacOS/gpsbabelfe-bin | grep '2 architectures' || exit 1 + file gui/objects/GPSBabelFE.app/Contents/MacOS/GPSBabelFE | grep '2 architectures' || exit 1 cd gui ; qmake && xcodebuild cd gui ; lupdate app.pro cd gui ; lrelease app.pro - mkdir gui/objects/gpsbabelfe-bin.app/Contents/MacOS/lang - cp gui/*.qm gui/objects/gpsbabelfe-bin.app/Contents/MacOS/lang - cp gpsbabel gui/objects/gpsbabelfe-bin.app/Contents/MacOS - cp -r gui/help gui/objects/gpsbabelfe-bin.app/Contents/MacOS - cp gui/gmapbase.html gui/objects/gpsbabelfe-bin.app/Contents/MacOS + mkdir gui/objects/GPSBabelFE.app/Contents/MacOS/lang + cp gui/*.qm gui/objects/gpsbabelFE.app/Contents/MacOS/lang + cp gpsbabel gui/objects/GPSBabelFE.app/Contents/MacOS + cp -r gui/help gui/objects/GPSBabelFE.app/Contents/MacOS + cp gui/gmapbase.html gui/objects/GPSBabelFE.app/Contents/MacOS tools/mac-localize # Build the Qt front end, place GPSBabel in the right place, deploy all # the libs. mac-gui-dmg: mac-gui - rm -f gui/objects/gpsbabelfe-bin.dmg - cd gui/objects ; macdeployqt gpsbabelfe-bin.app -dmg - mv gui/objects/gpsbabelfe-bin.dmg gui/objects/GPSBabel-$(VERSIOND).dmg + rm -f gui/objects/GPSBabelFE.dmg + cd gui/objects ; macdeployqt GPSBabelFE.app -dmg + mv gui/objects/GPSBabelFE.dmg gui/objects/GPSBabel-$(VERSIOND).dmg msvc-build: make CC=@CL.EXE DEBUGGING="" EXTRA_CFLAGS="-nologo -W3 -WL -D__WIN32__ -I msvc/expat " OUTPUT_SWITCH="-Fo" $(OBJS) diff --git a/configure b/configure index 71aee9479..16638b0dc 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for GPSBabel 1.3.7. +# Generated by GNU Autoconf 2.61 for GPSBabel 1.4.0. # # Report bugs to . # @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='GPSBabel' PACKAGE_TARNAME='gpsbabel' -PACKAGE_VERSION='1.3.7' -PACKAGE_STRING='GPSBabel 1.3.7' +PACKAGE_VERSION='1.4.0' +PACKAGE_STRING='GPSBabel 1.4.0' PACKAGE_BUGREPORT='BUG-REPORT-ADDRESS' # Factoring default headers for most tests. @@ -1212,7 +1212,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GPSBabel 1.3.7 to adapt to many kinds of systems. +\`configure' configures GPSBabel 1.4.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1278,7 +1278,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GPSBabel 1.3.7:";; + short | recursive ) echo "Configuration of GPSBabel 1.4.0:";; esac cat <<\_ACEOF @@ -1375,7 +1375,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GPSBabel configure 1.3.7 +GPSBabel configure 1.4.0 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1389,7 +1389,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GPSBabel $as_me 1.3.7, which was +It was created by GPSBabel $as_me 1.4.0, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1742,10 +1742,14 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu +DOCVERSION=`echo $PACKAGE_VERSION` + + # Increase GBBUILD for a new release -GBBUILD=20 +GBBUILD=21 # YYYYMMDD, please, if beta, i.e. "-beta20060413" -PACKAGE_RELEASE="-beta20100518" +# PACKAGE_RELEASE="-beta20100518" +# DOCVERSION=development cat >>confdefs.h <<_ACEOF #define PACKAGE_RELEASE "$PACKAGE_RELEASE" @@ -1753,9 +1757,8 @@ _ACEOF -DOCVERSION=`echo $PACKAGE_VERSION` -DOCVERSION=development -#DOCVERSION=1.3.6 + + GBMAJOR=`echo $PACKAGE_VERSION | (IFS="."; read major minor micro; echo $major)` @@ -5332,7 +5335,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GPSBabel $as_me 1.3.7, which was +This file was extended by GPSBabel $as_me 1.4.0, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5381,7 +5384,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -GPSBabel config.status 1.3.7 +GPSBabel config.status 1.4.0 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index 81aa550c1..6b8e4610b 100644 --- a/configure.in +++ b/configure.in @@ -3,17 +3,20 @@ AC_PREREQ(2.59) -AC_INIT(GPSBabel, 1.3.7, BUG-REPORT-ADDRESS) +AC_INIT(GPSBabel, 1.4.0, BUG-REPORT-ADDRESS) +DOCVERSION=`echo $PACKAGE_VERSION` + + # Increase GBBUILD for a new release -GBBUILD=20 +GBBUILD=21 # YYYYMMDD, please, if beta, i.e. "-beta20060413" -PACKAGE_RELEASE="-beta20100518" +# PACKAGE_RELEASE="-beta20100518" +# DOCVERSION=development AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$PACKAGE_RELEASE", [Define to the release name of this package.]) AC_SUBST(PACKAGE_RELEASE) -DOCVERSION=`echo $PACKAGE_VERSION` -DOCVERSION=development -#DOCVERSION=1.3.6 + + AC_SUBST(DOCVERSION) GBMAJOR=`echo $PACKAGE_VERSION | (IFS="."; read major minor micro; echo $major)` diff --git a/gbversion.h b/gbversion.h index 57831ff88..695712ea4 100644 --- a/gbversion.h +++ b/gbversion.h @@ -4,5 +4,5 @@ * * Isn't simplification via automation grand? */ -#define VERSION "1.3.7-beta20100518" -#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-development" +#define VERSION "1.4.0" +#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.4.0" diff --git a/gui/gpsbabel.ts b/gui/gpsbabel.ts index 9f490620a..98c36a129 100644 --- a/gui/gpsbabel.ts +++ b/gui/gpsbabel.ts @@ -777,6 +777,37 @@ Higher number provides more deitaled diagnostics. + + Donate + + Support GPSBabel + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">GPSBabel is free software built and supported by volunteers. It consumes vast amounts of time to create and support the software as well as money for mapping programs, GPS receivers, and development fixtures. Please see how you can <a href="http://www.gpsbabel.org"><span style=" text-decoration: underline; color:#0000ff;">contribute time or via PayPal (no account needed) or Google Checkout.</span></a></p></body></html> + + + + <p>Of course, if you've already contributed to the project or you just can't help the project, please check the box below to never see this message again.</p> + + + + Never show this message again. + + + + No, Thanks + + + + Contribute + + + FileDlgManager @@ -1358,6 +1389,10 @@ Some GPS data formats support only some subset of waypoints, tracks, and routes. Disable All + + Ignore mismatch between command line and GUI version. + + ProcessWaitDialog @@ -1738,6 +1773,29 @@ This option computes (or recomputes) a value for the GPS heading at each trackpo + + VersionMismatch + + GPSBabel Version Mismatch + + + + <b>A version mismatch has been detected.</b> + + + + GPSBabel command line version: + + + + GPSBabel GUI version: + + + + Never show this message again. + + + WayPtsWidget diff --git a/gui/gpsbabelfe.ts b/gui/gpsbabelfe.ts index 06d835811..9fde0e0bd 100644 --- a/gui/gpsbabelfe.ts +++ b/gui/gpsbabelfe.ts @@ -141,6 +141,43 @@ Higher number provides more deitaled diagnostics. + + Donate + + + Support GPSBabel + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">GPSBabel is free software built and supported by volunteers. It consumes vast amounts of time to create and support the software as well as money for mapping programs, GPS receivers, and development fixtures. Please see how you can <a href="http://www.gpsbabel.org"><span style=" text-decoration: underline; color:#0000ff;">contribute time or via PayPal (no account needed) or Google Checkout.</span></a></p></body></html> + + + + + <p>Of course, if you've already contributed to the project or you just can't help the project, please check the box below to never see this message again.</p> + + + + + Never show this message again. + + + + + No, Thanks + + + + + Contribute + + + FileDlgManager @@ -587,144 +624,144 @@ Higher number provides more deitaled diagnostics. - - + + default - + Select one or more input files - + Output File Name - + Error reading format configuration. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. - + Some file/device formats were not found during initialization. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. - + Input and output formats do not support %1 - + Input does not support %1; output format supports %2 - + Input format supports %1; output format does not support %2 - + Both input and output formats support %1 - + waypoints - + tracks - + routes - + There are no input options for format "%1" - - + + Options for %1 - + There are no output options for format "%1" - + No valid waypoints/routes/tracks translation specified - + No input file specified - + No valid output specified - + No output file specified - + Process "%1" did not start - + Process exited unsucessfully with code %1 - + Translation successful - + Error running gpsbabel: %1 - + Are you sure you want to reset all format options to default values? - + About %1 - + One or more data filters are active - + No data filters are active @@ -865,22 +902,27 @@ Some GPS data formats support only some subset of waypoints, tracks, and routes. - + + Ignore mismatch between command line and GUI version. + + + + Formats - + Enabled Formats - + Enable All - + Disable All @@ -1316,41 +1358,69 @@ This option computes (or recomputes) a value for the GPS heading at each trackpo UpgradeCheck - + HTTP - + Download failed: %1. - + Error - + Invalid return data at line %1: %2. - + A new version of GPSBabel is available.<br />Your version is %1 <br />The latest version is %2 - + Upgrade - + Do you wish to download an upgrade? + + VersionMismatch + + + GPSBabel Version Mismatch + + + + + <b>A version mismatch has been detected.</b> + + + + + GPSBabel command line version: + + + + + GPSBabel GUI version: + + + + + Never show this message again. + + + WayPtsWidget diff --git a/gui/gpsbabelfe_de.ts b/gui/gpsbabelfe_de.ts index 5143deb85..343f1ddb2 100644 --- a/gui/gpsbabelfe_de.ts +++ b/gui/gpsbabelfe_de.ts @@ -150,6 +150,43 @@ grössere Zahl bedeutet detailliertere Diagnosebeschreibungen. schlaue Kurznamen generieren. + + Donate + + + Support GPSBabel + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">GPSBabel is free software built and supported by volunteers. It consumes vast amounts of time to create and support the software as well as money for mapping programs, GPS receivers, and development fixtures. Please see how you can <a href="http://www.gpsbabel.org"><span style=" text-decoration: underline; color:#0000ff;">contribute time or via PayPal (no account needed) or Google Checkout.</span></a></p></body></html> + + + + + <p>Of course, if you've already contributed to the project or you just can't help the project, please check the box below to never see this message again.</p> + + + + + Never show this message again. + + + + + No, Thanks + + + + + Contribute + + + FileDlgManager @@ -417,23 +454,23 @@ grössere Zahl bedeutet detailliertere Diagnosebeschreibungen. MainWindow - - + + default default - + Select one or more input files eine oder mehrere Originaldateien markieren - + Output File Name Zieldatei-Name - + Error reading format configuration. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. @@ -442,7 +479,7 @@ This program cannot continue. Das Programm muss abgebrochen werden. - + Some file/device formats were not found during initialization. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. @@ -451,114 +488,114 @@ This program cannot continue. Das Prgramm muss abgebrochen werden. - + Input and output formats do not support %1 Keine Unterstützung für %1 im Ein- oder Ausgabeformat - + Input does not support %1; output format supports %2 Keine Unterstützung für %1 im Eingabeformat; Ausgabeformat unterstützt %2 - + Input format supports %1; output format does not support %2 Eingabeformat unterstützt %1. Keine Unterstützung für %2 im Ausgabeformat - + Both input and output formats support %1 Ein- und Ausgabeformat unterstützen %1 - + waypoints Wegpunkte - + tracks tracks - + routes Routen - + There are no input options for format "%1" Es gibt keine Eingabeoptionen für das Format "%1" - - + + Options for %1 Optionen für %1 - + There are no output options for format "%1" Es gibt keine Ausgabeoptionen für das Format "%1" - + No valid waypoints/routes/tracks translation specified keine gültige Angabe von Wegpunkt-/Routen-/Trackfiltern - + No input file specified keine Quelldatei angegeben - + No valid output specified keine gültiges Ziel angegeben - + No output file specified keine Zieldatei angegeben - + Process "%1" did not start Prozess "%1" wurde nicht gestartet - + Process exited unsucessfully with code %1 Prozess endete mit code %1 - + Translation successful Konvertierung erfolgreich - + Error running gpsbabel: %1 Fehler beim Aufruf von gpsbabel: %1 - + Are you sure you want to reset all format options to default values? Sind Sie sicher, dass Sie alle Formatoptionen auf die Vorgaben stellen wollen? - + About %1 Über %1 - + One or more data filters are active Einer oder mehrere Datenfilter sind aktiviert - + No data filters are active Keine Datenfilter sind aktiv @@ -940,22 +977,27 @@ Manche Dateiformate unterstuetzen nur eine Teilmenge, entweder Wegpunkte oder Tr - + + Ignore mismatch between command line and GUI version. + + + + Formats - + Enabled Formats - + Enable All - + Disable All Via GT Alle deaktivieren @@ -1470,32 +1512,32 @@ Diese Option generiert für jeden Trackpunkt einen Geschwindigkeitswert. Sie wir UpgradeCheck - + HTTP HTTP - + Download failed: %1. Download fehlgeschlagen: %1. - + Error - + Invalid return data at line %1: %2. - + A new version of GPSBabel is available.<br />Your version is %1 <br />The latest version is %2 Eine neue Version von GPSBabel ist verfügbar.<br />Die installierte Version ist %1 <br />Die neueste Version ist %2 - + Do you wish to download an upgrade? Möchten Sie die Aktualisierung herunter laden? @@ -1504,11 +1546,39 @@ Diese Option generiert für jeden Trackpunkt einen Geschwindigkeitswert. Sie wir <center><b>Eine neue GPSBabel-Version ist verf&uumlgbar</b><br>Die Version auf diesem Computer ist %1 <br>Die neueste Version ist %2</center> - + Upgrade Update + + VersionMismatch + + + GPSBabel Version Mismatch + + + + + <b>A version mismatch has been detected.</b> + + + + + GPSBabel command line version: + + + + + GPSBabel GUI version: + + + + + Never show this message again. + + + WayPtsWidget diff --git a/gui/gpsbabelfe_es.ts b/gui/gpsbabelfe_es.ts index 1d88d902c..f9b2661a4 100644 --- a/gui/gpsbabelfe_es.ts +++ b/gui/gpsbabelfe_es.ts @@ -200,6 +200,43 @@ Higher number provides more deitaled diagnostics. Crear nombres cortors de forma automática. + + Donate + + + Support GPSBabel + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">GPSBabel is free software built and supported by volunteers. It consumes vast amounts of time to create and support the software as well as money for mapping programs, GPS receivers, and development fixtures. Please see how you can <a href="http://www.gpsbabel.org"><span style=" text-decoration: underline; color:#0000ff;">contribute time or via PayPal (no account needed) or Google Checkout.</span></a></p></body></html> + + + + + <p>Of course, if you've already contributed to the project or you just can't help the project, please check the box below to never see this message again.</p> + + + + + Never show this message again. + + + + + No, Thanks + + + + + Contribute + + + FileDlgManager @@ -468,144 +505,144 @@ Higher number provides more deitaled diagnostics. MainWindow - - + + default Defecto - + Select one or more input files Seleccionar uno o más archivos de entrada - + Output File Name Nombre del fichero de salida - + Error reading format configuration. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. Se ha producido un error cuando se intentaba leer la configuración. Compruebe que el núcleo de "gpsbabel" está instalado correctamente y que se halla en la RUTA actual. Este programa no puede continuar. - + Some file/device formats were not found during initialization. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. El formato de alfunos ficheros o dispositivos no se halló durante la inicialización. Compruebe que el núcleo de "gpsbabel" está instalado correctamente y que se halla en la RUTA actual. Este programa no puede continuar. - + Input and output formats do not support %1 Formatos de entrada y salida inadmisibles %1 - + Input does not support %1; output format supports %2 Formatos de entrada inadmisible %1; Formatos de salida inadmisible %2 - + Input format supports %1; output format does not support %2 - + Both input and output formats support %1 Formatos de entrada y salida admisibles (ambos) %1 - + waypoints Puntos de interés - + tracks Registro de trazados - + routes Rutas - + There are no input options for format "%1" No hay opciones de entrada para el formato "%1" - - + + Options for %1 Opciones de %1 - + There are no output options for format "%1" No hay opciones de salida para el formato "%1" - + No valid waypoints/routes/tracks translation specified Se han especificicado puntos de interés, trazados o rutas no traducibles - + No input file specified No se ha especificado el fichero de entrada - + No valid output specified El fichero de salida no es válido - + No output file specified No se ha especificado el fichero de salida - + Process "%1" did not start El proceso "%1" no comenzó - + Process exited unsucessfully with code %1 El proceso terminó sin suerte y con el código %1 - + Translation successful Traducción realizada con éxito - + Error running gpsbabel: %1 Error ejecutando gpsbabel: %1 - + Are you sure you want to reset all format options to default values? ¿Estás seguro de que quieres volver a los formatos por defecto? - + About %1 Acerca de %1 - + One or more data filters are active Uno o más filtros de datos están activos - + No data filters are active Ningún filtro de datos está activo @@ -973,22 +1010,27 @@ Algunos formatos de datos de los GPS solo permiten utilizar una parte de los pun Enviar datos de uso de manera anónima. - + + Ignore mismatch between command line and GUI version. + + + + Formats Formatos - + Enabled Formats Formatos activos - + Enable All Activar todo - + Disable All Desactivar todo @@ -1484,32 +1526,32 @@ Esta opción calcula (o recalcula) un valor para la velocidad de cada punto del UpgradeCheck - + HTTP HTTP - + Download failed: %1. La descarga falló: %1. - + Error Error - + Invalid return data at line %1: %2. Ha devuelto datos no válidos en la línea %1: %2. - + A new version of GPSBabel is available.<br />Your version is %1 <br />The latest version is %2 Una nueva versióon de GPSBabel ha salido ya. <br />Tu versión es la %1 <br />La última versióon sería %2 - + Do you wish to download an upgrade? ¿Quieres bajarte una actualización? @@ -1518,11 +1560,39 @@ Esta opción calcula (o recalcula) un valor para la velocidad de cada punto del <center><b>Una nueva versión de GPSBabel está disponible </b><br>La versión actual es %1 <br> La versión más reciente es %2</center> - + Upgrade Actualizar + + VersionMismatch + + + GPSBabel Version Mismatch + + + + + <b>A version mismatch has been detected.</b> + + + + + GPSBabel command line version: + + + + + GPSBabel GUI version: + + + + + Never show this message again. + + + WayPtsWidget diff --git a/gui/gpsbabelfe_fr.ts b/gui/gpsbabelfe_fr.ts index 75614d774..3b0a050fd 100644 --- a/gui/gpsbabelfe_fr.ts +++ b/gui/gpsbabelfe_fr.ts @@ -141,6 +141,43 @@ Higher number provides more deitaled diagnostics. + + Donate + + + Support GPSBabel + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">GPSBabel is free software built and supported by volunteers. It consumes vast amounts of time to create and support the software as well as money for mapping programs, GPS receivers, and development fixtures. Please see how you can <a href="http://www.gpsbabel.org"><span style=" text-decoration: underline; color:#0000ff;">contribute time or via PayPal (no account needed) or Google Checkout.</span></a></p></body></html> + + + + + <p>Of course, if you've already contributed to the project or you just can't help the project, please check the box below to never see this message again.</p> + + + + + Never show this message again. + + + + + No, Thanks + + + + + Contribute + + + FileDlgManager @@ -407,144 +444,144 @@ Higher number provides more deitaled diagnostics. MainWindow - - + + default - + Select one or more input files - + Output File Name - + Error reading format configuration. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. - + Some file/device formats were not found during initialization. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. - + Input and output formats do not support %1 - + Input does not support %1; output format supports %2 - + Input format supports %1; output format does not support %2 - + Both input and output formats support %1 - + waypoints - + tracks - + routes - + There are no input options for format "%1" - - + + Options for %1 Options pour %1 - + There are no output options for format "%1" - + No valid waypoints/routes/tracks translation specified - + No input file specified - + No valid output specified - + No output file specified - + Process "%1" did not start - + Process exited unsucessfully with code %1 - + Translation successful - + Error running gpsbabel: %1 - + Are you sure you want to reset all format options to default values? - + About %1 - + One or more data filters are active - + No data filters are active @@ -913,22 +950,27 @@ Some GPS data formats support only some subset of waypoints, tracks, and routes. - + + Ignore mismatch between command line and GUI version. + + + + Formats - + Enabled Formats - + Enable All - + Disable All @@ -1365,41 +1407,69 @@ This option computes a value for the GPS speed at each trackpoint. This is most UpgradeCheck - + HTTP - + Download failed: %1. - + Error - + Invalid return data at line %1: %2. - + A new version of GPSBabel is available.<br />Your version is %1 <br />The latest version is %2 - + Do you wish to download an upgrade? - + Upgrade + + VersionMismatch + + + GPSBabel Version Mismatch + + + + + <b>A version mismatch has been detected.</b> + + + + + GPSBabel command line version: + + + + + GPSBabel GUI version: + + + + + Never show this message again. + + + WayPtsWidget diff --git a/gui/gpsbabelfe_hu.ts b/gui/gpsbabelfe_hu.ts index e5c0f332f..0be91da19 100644 --- a/gui/gpsbabelfe_hu.ts +++ b/gui/gpsbabelfe_hu.ts @@ -141,6 +141,43 @@ Higher number provides more deitaled diagnostics. + + Donate + + + Support GPSBabel + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">GPSBabel is free software built and supported by volunteers. It consumes vast amounts of time to create and support the software as well as money for mapping programs, GPS receivers, and development fixtures. Please see how you can <a href="http://www.gpsbabel.org"><span style=" text-decoration: underline; color:#0000ff;">contribute time or via PayPal (no account needed) or Google Checkout.</span></a></p></body></html> + + + + + <p>Of course, if you've already contributed to the project or you just can't help the project, please check the box below to never see this message again.</p> + + + + + Never show this message again. + + + + + No, Thanks + + + + + Contribute + + + FileDlgManager @@ -407,144 +444,144 @@ Higher number provides more deitaled diagnostics. MainWindow - - + + default - + Select one or more input files - + Output File Name - + Error reading format configuration. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. - + Some file/device formats were not found during initialization. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. - + Input and output formats do not support %1 - + Input does not support %1; output format supports %2 - + Input format supports %1; output format does not support %2 - + Both input and output formats support %1 - + waypoints - + tracks - + routes - + There are no input options for format "%1" - - + + Options for %1 - + There are no output options for format "%1" - + No valid waypoints/routes/tracks translation specified - + No input file specified - + No valid output specified - + No output file specified - + Process "%1" did not start - + Process exited unsucessfully with code %1 - + Translation successful - + Error running gpsbabel: %1 - + Are you sure you want to reset all format options to default values? - + About %1 - + One or more data filters are active - + No data filters are active @@ -908,22 +945,27 @@ Some GPS data formats support only some subset of waypoints, tracks, and routes. - + + Ignore mismatch between command line and GUI version. + + + + Formats - + Enabled Formats - + Enable All - + Disable All @@ -1360,41 +1402,69 @@ This option computes a value for the GPS speed at each trackpoint. This is most UpgradeCheck - + HTTP - + Download failed: %1. - + Error - + Invalid return data at line %1: %2. - + A new version of GPSBabel is available.<br />Your version is %1 <br />The latest version is %2 - + Do you wish to download an upgrade? - + Upgrade + + VersionMismatch + + + GPSBabel Version Mismatch + + + + + <b>A version mismatch has been detected.</b> + + + + + GPSBabel command line version: + + + + + GPSBabel GUI version: + + + + + Never show this message again. + + + WayPtsWidget diff --git a/gui/gpsbabelfe_it.ts b/gui/gpsbabelfe_it.ts index 1f5c5424a..211af08dc 100644 --- a/gui/gpsbabelfe_it.ts +++ b/gui/gpsbabelfe_it.ts @@ -162,6 +162,43 @@ Un numero più alto fornisce un livello di diagnosi più dettagliato.Opzioni predefinite dei formati + + Donate + + + Support GPSBabel + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">GPSBabel is free software built and supported by volunteers. It consumes vast amounts of time to create and support the software as well as money for mapping programs, GPS receivers, and development fixtures. Please see how you can <a href="http://www.gpsbabel.org"><span style=" text-decoration: underline; color:#0000ff;">contribute time or via PayPal (no account needed) or Google Checkout.</span></a></p></body></html> + + + + + <p>Of course, if you've already contributed to the project or you just can't help the project, please check the box below to never see this message again.</p> + + + + + Never show this message again. + + + + + No, Thanks + + + + + Contribute + + + FileDlgManager @@ -609,23 +646,23 @@ Un numero più alto fornisce un livello di diagnosi più dettagliato.Controlla aggiornamenti - - + + default predefinite - + Select one or more input files Selezionare uno o più file in ingresso - + Output File Name Nome del file in uscita - + Error reading format configuration. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. @@ -634,7 +671,7 @@ This program cannot continue. Questo programma non può proseguire. - + Some file/device formats were not found during initialization. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. @@ -643,115 +680,115 @@ This program cannot continue. Questo programma non può proseguire. - + Input and output formats do not support %1 I formati di ingresso e di uscita non supportano %1 - + Input does not support %1; output format supports %2 L'ingresso non supporta %1, il formato di destinazione supporta %2 - + Input format supports %1; output format does not support %2 Il formato in ingresso supporta %1, il formato di destinazione non supporta %2 - + Both input and output formats support %1 I formati di origine e di destinazione supportano %1 - + waypoints punti di interesse - + tracks tracce - + routes rotte - + There are no input options for format "%1" Non ci sono opzioni in ingresso per il formato "%1" - - + + Options for %1 Opzioni per %1 - + There are no output options for format "%1" Non ci sono opzioni in uscita per il formato "%1" - + No valid waypoints/routes/tracks translation specified Non è stato specificato alcun punto di interesse/rotta/traccia - + No input file specified Il file di origine non è stato specificato - + No valid output specified Non è stata specificata una destinazione valida - + No output file specified Il file di destinazione non è stato specificato - + Process "%1" did not start Il processo "%1" non è stato avviato - + Process exited unsucessfully with code %1 Il processo è terminato con il codice di errorre %1 - + Translation successful Traduzione terminata con successo - + Error running gpsbabel: %1 Errore durante l'esecuzione di gpsbabel: %1 - + Are you sure you want to reset all format options to default values? Si è certi di voler reimpostare tutte le opzioni dei formati ai valori predefiniti? - + About %1 Informazioni su %1 - + One or more data filters are active È attivo uno o più filtri di dati - + No data filters are active Nessun filtro di dati è attivo @@ -894,22 +931,27 @@ Qualche formato di dati del GPS supporta solo un sottoinsieme di punti di intere Trasmetti informazioni anonime sull'utilizzo. - + + Ignore mismatch between command line and GUI version. + + + + Formats Formati - + Enabled Formats Formati abilitati - + Enable All Abilita tutti - + Disable All Disabilita tutti @@ -1374,41 +1416,69 @@ Questa opzione calcola (o ricalcola) un valore per la direzione del GPS in ogni UpgradeCheck - + HTTP HTTP - + Download failed: %1. Scaricamento non riuscito: %1. - + Error Errore - + Invalid return data at line %1: %2. Dati ricevuti non validi alla linea %1: %2. - + A new version of GPSBabel is available.<br />Your version is %1 <br />The latest version is %2 È disponibile una nuova versione di GPSBabel.<br />Versione corrente: %1 <br />Nuova versione: %2 - + Upgrade Aggiorna - + Do you wish to download an upgrade? Si desidera scaricare un aggiornamento? + + VersionMismatch + + + GPSBabel Version Mismatch + + + + + <b>A version mismatch has been detected.</b> + + + + + GPSBabel command line version: + + + + + GPSBabel GUI version: + + + + + Never show this message again. + + + WayPtsWidget diff --git a/gui/gpsbabelfe_ru.qm b/gui/gpsbabelfe_ru.qm index 5ab1d6bf0..f07a86a71 100644 Binary files a/gui/gpsbabelfe_ru.qm and b/gui/gpsbabelfe_ru.qm differ diff --git a/gui/gpsbabelfe_ru.ts b/gui/gpsbabelfe_ru.ts index df31c5b3d..9c0c73390 100644 --- a/gui/gpsbabelfe_ru.ts +++ b/gui/gpsbabelfe_ru.ts @@ -160,6 +160,43 @@ Higher number provides more deitaled diagnostics. Параметры по умолчанию + + Donate + + + Support GPSBabel + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">GPSBabel is free software built and supported by volunteers. It consumes vast amounts of time to create and support the software as well as money for mapping programs, GPS receivers, and development fixtures. Please see how you can <a href="http://www.gpsbabel.org"><span style=" text-decoration: underline; color:#0000ff;">contribute time or via PayPal (no account needed) or Google Checkout.</span></a></p></body></html> + + + + + <p>Of course, if you've already contributed to the project or you just can't help the project, please check the box below to never see this message again.</p> + + + + + Never show this message again. + + + + + No, Thanks + + + + + Contribute + + + FileDlgManager @@ -607,23 +644,23 @@ Higher number provides more deitaled diagnostics. Проверить обновления - - + + default по умолчанию - + Select one or more input files Выберите один или несколько файлов - + Output File Name Имя выходного файла - + Error reading format configuration. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. @@ -632,7 +669,7 @@ This program cannot continue. Выполнение программы не может быть продолжено. - + Some file/device formats were not found during initialization. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. @@ -641,114 +678,114 @@ This program cannot continue. Выполнение программы не может быть продолжено. - + Input and output formats do not support %1 Входной и выходной форматы не поддерживают %1 - + Input does not support %1; output format supports %2 Входной формат не поддерживает %1; выходной формат поддерживает %2 - + Input format supports %1; output format does not support %2 Входной формат поддерживает %1; выходной формат не поддерживаетt %2 - + Both input and output formats support %1 Входной и выходной формат поддерживают %1 - + waypoints маршрутные точки - + tracks треки - + routes маршруты - + There are no input options for format "%1" Нет входных параметров для формата "%1" - - + + Options for %1 Параметры %1 - + There are no output options for format "%1" Нет выходных параметров для формата "%1" - + No valid waypoints/routes/tracks translation specified Не выбрано преобразование маршрутных точек/маршрутов/треков - + No input file specified Не выбран входной файл - + No valid output specified Не выбран выходной файл - + No output file specified Не выбран выходной файл - + Process "%1" did not start Процесс "%1" не запустился - + Process exited unsucessfully with code %1 Процесс завершился неудачей с кодом %1 - + Translation successful Конвертация выполнена - + Error running gpsbabel: %1 Ошибка запуска gpsbabel: %1 - + Are you sure you want to reset all format options to default values? Вы действительно желаете сбросить все параметры формата в значения по умолчанию? - + About %1 О %1 - + One or more data filters are active Один или более фильтров данных активны - + No data filters are active Фильтры данных не активны @@ -891,22 +928,27 @@ Some GPS data formats support only some subset of waypoints, tracks, and routes. Анонимно отправлять используемые данные. - + + Ignore mismatch between command line and GUI version. + + + + Formats Форматы - + Enabled Formats Доступные форматы - + Enable All Включить все - + Disable All Отключить все @@ -1371,41 +1413,69 @@ This option computes (or recomputes) a value for the GPS heading at each trackpo UpgradeCheck - + HTTP - + Download failed: %1. Загрузка завершилась неудачей: %1. - + Error Ошибка - + Invalid return data at line %1: %2. Некорректные данные возвращены в строке %1: %2. - + A new version of GPSBabel is available.<br />Your version is %1 <br />The latest version is %2 Доступна новая версия GPSBabel.<br />Используемая версия %1 <br />Последняя доступная версия %2 - + Upgrade Обновить - + Do you wish to download an upgrade? Загрузить обновление? + + VersionMismatch + + + GPSBabel Version Mismatch + + + + + <b>A version mismatch has been detected.</b> + + + + + GPSBabel command line version: + + + + + GPSBabel GUI version: + + + + + Never show this message again. + + + WayPtsWidget diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 64d75b2fa..33f8be382 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -1,5 +1,5 @@ // -*- C++ -*- -// $Id: mainwindow.cpp,v 1.21 2010/06/19 23:59:06 robertl Exp $ +// $Id: mainwindow.cpp,v 1.22 2010/06/20 04:16:21 robertl Exp $ //------------------------------------------------------------------------ // // Copyright (C) 2009 S. Khai Mong . @@ -199,7 +199,7 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) } if (!bd.ignoreVersionMismatch && babelVersion != VERSION) { - VersionMismatch vm(0, babelVersion, QString(appName) + QString(" " VERSION)); + VersionMismatch vm(0, babelVersion, QString(appName) + QString(" Version " VERSION)); vm.exec(); bd.ignoreVersionMismatch = vm.neverAgain(); diff --git a/gui/setup.iss b/gui/setup.iss index b73b4eacd..79d2caef4 100755 --- a/gui/setup.iss +++ b/gui/setup.iss @@ -1,4 +1,4 @@ -; $Id: setup.iss,v 1.20 2010/06/19 23:47:45 robertl Exp $ +; $Id: setup.iss,v 1.21 2010/06/20 04:16:21 robertl Exp $ ; ; NOTE: setup.iss is generated from setup.iss.in via autoconf. ; The generated setup.iss is checked in to help keep the version numbers diff --git a/tools/mac-localize b/tools/mac-localize index f34e72027..96a250aec 100755 --- a/tools/mac-localize +++ b/tools/mac-localize @@ -8,5 +8,5 @@ cd gui for i in $(echo gpsbabelfe_??.ts | sed 's/gpsbabelfe_\(..\).ts/\1/g') do - mkdir objects/gpsbabelfe-bin.app/Contents/Resources/$i.lproj + mkdir objects/GPSBabelFE.app/Contents/Resources/$i.lproj done